(byte-optimize-form-code-walker):

If compiler-macroexpand is defined, use it.

diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index be958e53abb51093d9dd1935be9a2fb2c0d57ee1..90154728f3404ddda9264107889159c4a4802434 100644 (file)
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -504,6 +504,13 @@
                    (setq form (macroexpand form
                                            byte-compile-macro-environment))))
           (byte-optimize-form form for-effect))
+
+         ;; Support compiler macros as in cl.el.
+         ((and (fboundp 'compiler-macroexpand)
+               (not (eq form
+                        (setq form (compiler-macroexpand form
+                                    byte-compile-macro-environment)))))
+          (byte-optimize-form form for-effect))
          
          ((not (symbolp fn))
           (or (eq 'mocklisp (car-safe fn)) ; ha!